<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
     <div>git第一次提交</div>
     <div>git合并之前要先拉取下当前分支的最新代码</div>
     <div>git 合并代码测是否产生冲突6666339999maindevmaster冲突李四</div>
     <div>git 具体内容</div>
     <div>哈哈哈</div>
     <div class="box">测试</div>
     <div class="box2">修改完成</div>
</body>
<script>
     console.log("hello world11122222");
     function fn(){
         console.log("hello world");
     }
     fn();
     alert("hello world");
</script>
<style>
 .box {
    width: 100px;
    height: 100px;
    background-color: red;
 }
</style>
</html>